Skip to content

Comments

[9.0] Switch to fork of opentelemetry-collector-contrib and restore beat receivers#7411

Merged
cmacknz merged 9 commits intoelastic:9.0from
cmacknz:cmacknz/9.0-use-otel-contrib-fork
Mar 18, 2025
Merged

[9.0] Switch to fork of opentelemetry-collector-contrib and restore beat receivers#7411
cmacknz merged 9 commits intoelastic:9.0from
cmacknz:cmacknz/9.0-use-otel-contrib-fork

Conversation

@cmacknz
Copy link
Member

@cmacknz cmacknz commented Mar 13, 2025 •
edited
Loading

This reverts #7023 and uses a replace directive pointed at the HEAD of the https://github.com/elastic/opentelemetry-collector-contrib/commits/9.0/ branch to allow us to downgrade prometheus to a version that Beats can support.

The 0.300 version of Prometheus introduces breaking changes that we do not have time to incorporate, at the same time we need the v0.120.0 version of the elasticsearch exporter.

elastic/opentelemetry-collector-contrib@19cd4e8 removing the 0.300 Prometheus dependency upgrade is the only commit in the fork above that is different from the upstream v0.120.0 release.

@cmacknz cmacknz self-assigned this Mar 13, 2025
@cmacknz cmacknz mentioned this pull request Mar 17, 2025
Merged
cmacknz
cmacknz commented Mar 17, 2025
View reviewed changes
cmacknz
cmacknz commented Mar 17, 2025
View reviewed changes
@mergify
Copy link
Contributor

mergify bot commented Mar 17, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b cmacknz/9.0-use-otel-contrib-fork upstream/cmacknz/9.0-use-otel-contrib-fork
git merge upstream/9.0
git push upstream cmacknz/9.0-use-otel-contrib-fork

@cmacknz cmacknz marked this pull request as ready for review March 17, 2025 20:55
@cmacknz cmacknz requested a review from a team as a code owner March 17, 2025 20:55
@cmacknz cmacknz mentioned this pull request Mar 17, 2025
Merged
5 tasks
@elastic-sonarqube
Copy link

elastic-sonarqube bot commented Mar 17, 2025

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 17, 2025

💚 Build Succeeded

History

cc @cmacknz

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Mar 18, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 18, 2025

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@cmacknz cmacknz merged commit e0db952 into elastic:9.0 Mar 18, 2025
13 checks passed
@cmacknz cmacknz mentioned this pull request Mar 18, 2025
Closed
3 tasks
@cmacknz cmacknz deleted the cmacknz/9.0-use-otel-contrib-fork branch March 18, 2025 16:24
@mauri870 mauri870 mentioned this pull request Apr 1, 2025
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@swiatekm swiatekm swiatekm approved these changes

@andrzej-stencel andrzej-stencel Awaiting requested review from andrzej-stencel

Assignees

@cmacknz cmacknz

Labels

skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@cmacknz @elasticmachine @andrzej-stencel @swiatekm @pierrehilbert